js: Adapt for ::child-{added,removed}

These were previously known as ::actor-{added,removed}

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3014>

diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 11945a7884080ee6e2bf243d8737ea092d4e381d..ebf8dda5545ab979164216c262dc0fc0e7739509 100644 (file)
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -1005,8 +1005,8 @@ class CalendarMessageList extends St.Widget {
             y_align: Clutter.ActorAlign.START,
         });
         this._sectionList.connectObject(
-            'actor-added', this._sync.bind(this),
-            'actor-removed', this._sync.bind(this),
+            'child-added', this._sync.bind(this),
+            'child-removed', this._sync.bind(this),
             this);
         this._scrollView.child = this._sectionList;
 

diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index 81eabf97a79724a090c83cfaf981dc30da8d2149..916d69ce412a317c819ec6aa051b81cc9a79667d 100644 (file)
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -1192,8 +1192,8 @@ export const IconGrid = GObject.registerClass({
         this._currentPage = 0;
         this._currentMode = -1;
 
-        this.connect('actor-added', this._childAdded.bind(this));
-        this.connect('actor-removed', this._childRemoved.bind(this));
+        this.connect('child-added', this._childAdded.bind(this));
+        this.connect('child-removed', this._childRemoved.bind(this));
         this.connect('destroy', () => layoutManager.disconnect(pagesChangedId));
     }
 

diff --git a/js/ui/lightbox.js b/js/ui/lightbox.js
index b461aa58fa856e68d8849fc4154fa749fea92dab..577484137668d3d7e51dcb931787a0871c0d4b3d 100644 (file)
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@@ -157,8 +157,8 @@ export const Lightbox = GObject.registerClass({
         }
 
         container.connectObject(
-            'actor-added', this._actorAdded.bind(this),
-            'actor-removed', this._actorRemoved.bind(this), this);
+            'child-added', this._childAdded.bind(this),
+            'child-removed', this._childRemoved.bind(this), this);
 
         this._highlighted = null;
     }
@@ -167,7 +167,7 @@ export const Lightbox = GObject.registerClass({
         return this._active;
     }
 
-    _actorAdded(container, newChild) {
+    _childAdded(container, newChild) {
         let children = this._container.get_children();
         let myIndex = children.indexOf(this);
         let newChildIndex = children.indexOf(newChild);
@@ -241,7 +241,7 @@ export const Lightbox = GObject.registerClass({
         }
     }
 
-    _actorRemoved(container, child) {
+    _childRemoved(container, child) {
         let index = this._children.indexOf(child);
         if (index !== -1) // paranoia
             this._children.splice(index, 1);

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index 3a8c0be7354c9b07bd600e37c0a602afad729d90..3b3c7462554a568d411f82aa01ee8199c7495eb4 100644 (file)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -950,10 +950,10 @@ class ActorTreeViewer extends St.BoxLayout {
             return;
 
         data.visible = true;
-        data.actorAddedId = actor.connect('actor-added', (container, child) => {
+        data.actorAddedId = actor.connect('child-added', (container, child) => {
             this._addActor(data.children, child);
         });
-        data.actorRemovedId = actor.connect('actor-removed', (container, child) => {
+        data.actorRemovedId = actor.connect('child-removed', (container, child) => {
             this._removeActor(child);
         });
 

diff --git a/js/ui/messageList.js b/js/ui/messageList.js
index 15d0c5e124800f8c12e8fa89c3bb442605992801..b86ab37eb95a359313a3c14a4d8412924ab1856e 100644 (file)
--- a/js/ui/messageList.js
+++ b/js/ui/messageList.js
@@ -576,8 +576,8 @@ export const MessageListSection = GObject.registerClass({
         });
         this.add_child(this._list);
 
-        this._list.connect('actor-added', this._sync.bind(this));
-        this._list.connect('actor-removed', this._sync.bind(this));
+        this._list.connect('child-added', this._sync.bind(this));
+        this._list.connect('child-removed', this._sync.bind(this));
 
         Main.sessionMode.connectObject(
             'updated', () => this._sync(), this);